Skip to content

[libvpl] New port [ffmpeg] switch qsv from mfx to vpl [fdk-aac] Fix android support#51419

Merged
BillyONeal merged 10 commits intomicrosoft:masterfrom
xiaozhuai:dev-ffmpeg
May 2, 2026
Merged

[libvpl] New port [ffmpeg] switch qsv from mfx to vpl [fdk-aac] Fix android support#51419
BillyONeal merged 10 commits intomicrosoft:masterfrom
xiaozhuai:dev-ffmpeg

Conversation

@xiaozhuai
Copy link
Copy Markdown
Contributor

@xiaozhuai xiaozhuai commented Apr 28, 2026

  • Changes comply with the maintainer guide.
  • SHA512s are updated for each updated download.
  • The "supports" clause reflects platforms that may be fixed by this new version, or no changes were necessary.
  • Any fixed CI baseline and CI feature baseline entries are removed from that file, or no entries needed to be changed.
  • All patch files in the port are applied and succeed.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Exactly one version is added in each modified versions file.

Based on #51196

  1. [libvpl] New port
  2. [ffmpeg] switch qsv from mfx to vpl
  3. [fdk-aac] Fix android support

@BillyONeal
Copy link
Copy Markdown
Member

BillyONeal commented Apr 29, 2026

Sorry for the traffic, I was going to try to separate this out and run it in my local copies but somehow even though I did git push --set-upstream BillyONeal a subsequent git push overwrote this remote :(

Since I already pushed here I'm just going to finish fixing it.

Copy link
Copy Markdown
Member

@BillyONeal BillyONeal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I observe that ffmpeg[all], ffmpeg[all-gpl], and ffmpeg[all-nonfree] are currently possible to "cascade" in ci.feature.baseline.txt which should not be possible; the whole purpose of those features appears to be to pick a configuration that is possible, at least for the known non-community triplets.

Comment thread ports/libvpl/vcpkg.json Outdated
@xiaozhuai
Copy link
Copy Markdown
Contributor Author

@BillyONeal Thanks for the fix

@BillyONeal BillyONeal self-assigned this Apr 29, 2026
@xiaozhuai
Copy link
Copy Markdown
Contributor Author

Very odd, pkgconfig cannot find vpl >= 2.6. I checked the vpl.pc and is good.

@xiaozhuai xiaozhuai force-pushed the dev-ffmpeg branch 2 times, most recently from 5913e8f to 7f0554b Compare April 29, 2026 03:42
@BillyONeal
Copy link
Copy Markdown
Member

OK since you have now pushed I'll go back to fixing the remaining bits in a PR against you. (I need to fix the consequences of removing the cascade lines for the "group features")

@xiaozhuai
Copy link
Copy Markdown
Contributor Author

xiaozhuai commented Apr 29, 2026

@BillyONeal Thank you, ffmpeg[qsv]:x64-linux should pass now.
I observe that ffmpeg[opengl] fails on many triplets. I don't know how to fix them; it doesn't seem like a new issue introduced by this PR.

@xiaozhuai
Copy link
Copy Markdown
Contributor Author

xiaozhuai commented Apr 29, 2026

Can we use sccache or something here in CI?
For a port like ffmpeg, which takes a long time to build and has a vast array of features, waiting for CI to finish is a real drag. 🙃

@xiaozhuai xiaozhuai force-pushed the dev-ffmpeg branch 4 times, most recently from fdca2fd to 74a5ec1 Compare April 29, 2026 12:26
Comment thread ports/libvpl/001-fix-pkgconfig.patch Outdated
Comment thread ports/libvpl/001-fix-pkgconfig.patch Outdated
Comment thread ports/libvpl/001-fix-pkgconfig.patch Outdated
Comment thread ports/libvpl/usage Outdated
Comment thread scripts/ci.feature.baseline.txt Outdated
Comment on lines +288 to +291
ffmpeg[all](android | (linux & arm64))=feature-fails
ffmpeg[all-gpl](android | (linux & arm64))=feature-fails
ffmpeg[all-nonfree](android | (linux & arm64))=feature-fails
ffmpeg[all-nonfree](android)=cascade
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ffmpeg[all](android | (linux & arm64))=feature-fails
ffmpeg[all-gpl](android | (linux & arm64))=feature-fails
ffmpeg[all-nonfree](android | (linux & arm64))=feature-fails
ffmpeg[all-nonfree](android)=cascade
ffmpeg[all](android | (linux & arm64))=feature-fails
ffmpeg[all-gpl](android | (linux & arm64))=feature-fails
ffmpeg[all-nonfree](android | (linux & arm64))=feature-fails
/vcpkg/scripts/azure-pipelines/../ci.feature.baseline.txt:291:8: error: 'all-nonfree' was already declared as 'feature-fails'
  on expression: ffmpeg[all-nonfree](android)=cascade
                        ^
/vcpkg/scripts/azure-pipelines/../ci.feature.baseline.txt:290:8: note: previous declaration was here
  on expression: ffmpeg[all-nonfree](android | (linux & arm64))=feature-fails
                        ^

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/vcpkg/scripts/azure-pipelines/../ci.feature.baseline.txt:290:8: error: ffmpeg[core,all-nonfree]:x64-android was unexpectedly a cascading failure because the following dependencies are unavailable: fdk-aac[he-aac]:x64-android only supports !android
/vcpkg/scripts/azure-pipelines/../ci.feature.baseline.txt:290:8: note: consider changing this to =cascade instead

Copy link
Copy Markdown
Contributor Author

@xiaozhuai xiaozhuai Apr 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fdk-aac[he-aac](android) now should work.

xiaozhuai and others added 7 commits April 30, 2026 11:58
Co-authored-by: Derek Cyrus-Chow <7149253+dcyruschow-cat@users.noreply.github.com>
Fix ffmpeg[qsv] cascade declaration.
Remove cascade declarations for ffmpeg meta-features.
Co-authored-by: Billy O'Neal <bion@microsoft.com>
@xiaozhuai xiaozhuai changed the title [libvpl] New port [ffmpeg] switch qsv from mfx to vpl [libvpl] New port [ffmpeg] switch qsv from mfx to vpl [fdk-aac] Fix android support Apr 30, 2026
@xiaozhuai
Copy link
Copy Markdown
Contributor Author

xiaozhuai commented Apr 30, 2026

Can we use sccache or something here in CI?
For a port like ffmpeg, which takes a long time to build and has a vast array of features, waiting for CI to finish is a real drag. 🙃

@BillyONeal @vicroms
Please consider my suggestion:
Every time I update this PR, I have to wait about 4 hours for CI to finish. Too long for a cup of coffee. 🙃
This can make contributing to ports like ffmpeg feel like a chore.
Currently, CI spends a lot of time repeatedly compiling the same source code with same flags.
Introducing sccache can greatly improve this and make verification quick and easy.
We can limit the cache lifetime to each job.
Also, we can restrict the use of sccache to jobs triggered by PRs.

@xiaozhuai
Copy link
Copy Markdown
Contributor Author

netgen:x64-android is unrelated regression.

Copy link
Copy Markdown
Member

@BillyONeal BillyONeal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@BillyONeal BillyONeal enabled auto-merge (squash) May 1, 2026 01:07
@xiaozhuai
Copy link
Copy Markdown
Contributor Author

netgen:x64-android is unrelated regression.

@BillyONeal This pr cannot be auto-merged. netgen:x64-android fails.

@BillyONeal
Copy link
Copy Markdown
Member

Yeah, build was still running when I set auto merge. I'm investigating in #51494 and will keep you posted.

@BillyONeal
Copy link
Copy Markdown
Member

Confirmed, identical failure in "do nothing" change #51494

@BillyONeal BillyONeal disabled auto-merge May 2, 2026 10:28
@BillyONeal BillyONeal merged commit bc79807 into microsoft:master May 2, 2026
14 of 16 checks passed
@BillyONeal
Copy link
Copy Markdown
Member

Ah crap, I missed that the "unrelated" change actually breaks one of the "-ci-" ports which has now caused all PRs to start failing :(

@xiaozhuai
Copy link
Copy Markdown
Contributor Author

Is there anything I can do to help?

@xiaozhuai xiaozhuai deleted the dev-ffmpeg branch May 2, 2026 22:27
@xiaozhuai
Copy link
Copy Markdown
Contributor Author

I missed that too, I'll submit a new pull request right away to fix it.

@xiaozhuai
Copy link
Copy Markdown
Contributor Author

#51509

@BillyONeal
Copy link
Copy Markdown
Member

#51516

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants